merge bug fixes