Update bootstrap and some cleanup