more updates to 0.6.4