Bootstrap, lots of fixes and additional functionality