fixed some crazy things, next time make small changes before committing