added all kinds of stuff

this is a terrible commit message; forgive me