stuff, mostly fixes