many changes, generally working on thesis