Important update on some key functions. Fix a bug.