Correcting minor bugs after testing. Cleaning up tomorow with daemon implementation