fixed some bugs, ready to release