Fixed stuff up a bit