Lots of fixes for multihack