Added stuff, fixed things, as always~