noticed some bug concerning the mass. final commit before trying to fix it.