merge bug fixes, etc