Bits and pieces

Read all the commits individually. I left a few things for you to tackle.