Tweak URLs
OOify, more comments