fixed some bugs due to mass changes