changed lots, some bug introduces... the file handlers aren't done properly