fixed all the small shizzle from rtm