fixes and additions from the forum