added a bunch o stuff