Fixes and progress