made lots of changes
wrote some more stuff