Fixes and progress still