bug fixes and apache 2.4