Remove small issues in code; general debug