some bugs resolved. cesna added