Many Changes

fixes nearly everything