Fixed some bugs which were related to use of quake and soap