Fixed strings, added comments