Fixed Some Bugs- seems to be working now