fixed/messed stuff up