added more stuff

I really need to clean up my code and work on documentation...