major bug fixes
continued major bug fixes