0.6b

fixed some bugs