0.16.04 (Nivve) lots of fixes