In Progress

Fix some Bugs