accButtons updates + bug fixes