fixes, changes and updates