Fixes and improvements for 1.4b2