Bug fixes

FIXED:
 - fixed the main file to work with new class files