cleaned a lot of stuff up