fixed a few override errors and missing fields
removed other module that crept into last comit