Some tidying...

Updated bootstrap and tidied up a bit…