moved several any methods into their own files, and fixed bugs in their implementations.