Fixing comment save/load and bugs.