added some new Classes, corrected filehandler