Renamed settings file to avoid collisions with files from other plugins + minor fixes
Small refactoring