Move macro up; reorg code a little; fix and demo manualMethod