Fixed the stuff up XD