Final fixes and I am going to bed .. promise