tons o stuff

forgot to commit for a long time :(