more stylistic changes, fix bubble bugs