more bootstrap work
bootstrap working
fix
merge, fix, etc