The best of the best

Changes from both propeople and os2webcore