completed major bug fixes