Fixed ome bugs and changed some method names