Fix some things, add some stuff