updates to speed up boots
merge mbair into master