fixed some subtle bugs
0.0.15