fixed some bugs, added couple ext methods