Fixed Some Bugs, Closing #3