Still broken

Some more bugs squished