improved some stuff, broke most other stuff