Bower support, and minor clean up