Fixing & marking annoyances found