More work. Getting ready for 1.4.0 release