Uncommited changes

All small details, not sure why they weren't commited.