Suggested changes from barbaz

Discussion of changes at http://forums.informaction.com/viewtopic.php?f=18&t=19666