Moar fixes and stuff n things