more bootstrap integration, cleanup and some small bugfixes