Removed bootstrap
Added bootstrap submodule
Some bug fixes