Fixes & manager improvement