bug fixes
0.9-beta-2