further tweaks to the 1.7.10 port
disabled bc untils it gets properly updated to 1.7.10