Comments fix & session controller prepare