AS & BL: removed whitespace and flash errors