Added the Dawnstone & cleaned some stuff