tidy some things
rip more out