Organized helm config + minor tweaking