changed a lot of things... going to clean up now