Added stuff, fixed stuff