Moar bug fixes and dickbutt