Lots of tweaks. Still broken