some bug fixes for A1A3