There are always more bugs. Commenting and save screen functionality