fixed, and modified some modules