add Henry's address
Fix the most obvious XXX FIXMEs