Some Changes

Small changes to try to fix things like the while loop and the horribly
broken set!s.