major bug updates