Readibility stuff, small bug fixes.