Lot's o stuff to be commited.

If you are reading this, I have commited changes.