cleaning up a bunch of stuff and fixing some potential errors