Fixed some bugs. Add normal quot