updated to snapshot version
fixed some bugs