Make minor improvements + Add @alrra