baseline major bug fixes