more changes for 0.5 alpha