Fixes, additional work