style updates, a few fixes for older versions as well as other fixes