fixes, changes etc