Merge with bleeding for important fixes

This improves on the current version greatly