Various fixes, 1.6.0 raedy