fixed infinite loop bug introduced. Removed unused timer methods in scheduler
Fixed several loop bugs, and finished Logger class
Merge master and LogAndFix