fix some errors
fix branch issue
fix error in show method