More updates for 0.2.1.0 release