Lot of stuff, refactoring mostly.