Updated thesis, fixed citations