Bug fixes

Onto testing phase now. After everything has been thoroughly tested
coding the timeline will begin.