moar bugs fixed