many changes for 0.9.3-dev