fix 0.005
fix 0.006
merging accountCreation changes, addressed conflicts