added bootstrap, more hacking