fixed a handful of things