mike
merge
fixed some bugs