cleaned up some things, still theory deviation tho