More banners and minor fixes