Fixed Stuff up