added lots of stuff, updated thesis