added bugs, enhamcements and features