fixed a bunch o stuff