*Some bugfixes & cleaned up GeneralModule