Final updates before 0.4 release