Fixed some bugs, updated help messages
Fixed branch problem