Comments fixed. Security for Incendio will be added later on