adding stuff to Bootstrap + bugfixes