fixes

everything is ready but comments and datetime