fixed up documentation a bit, added merfoo