cleaned up added code, missing files