Final fixes before continueing development