bootstrap 3.2 -> 3.3; some minor fixes