fix all bugs in this version