add bootstrap, other minor fixes