1.6 release - needs testing and stuff