Teaking things, fixing ordering issues