major updates, lots of broken stuff