Remove done TODOs and fix bootstrap typo