Adds some comments and renames a mask for rest