fixes, changes, additions