style and a2 fixes