add all my additions from the depracated 8226-common tree