Added comments + bugfix with underscore missing