bug fixes, now A1A2 should load properly