Fixing Bugs

it now works

somewhat