Remove .sh
Fixed some bugs