moar hacking and fixing