0.6b - bug fixes