updated to forge 1207

code cleanup

important classes added