Removed function_iterator, fixed a namespace problem, and some printing format changes.