Found several bugs self testing the application. Fixed all found bugs.