add notes and adjust marco settings