fixes, changes