Removed bootstrap and bugfixes