bug fixes for acceleration