Moar fixes (and new bugs as well!!)