Fixes and Work