A bunch of enchancements and fixes - 2.5