Various fixes submitted by cm27, tundracanine, stoner, mistero;