updates
major bug squash