Squished bugs

Syntax and logic fixes actually