Debugged and fixed nuances