Bugfix + numeric output of retval's.