multiple fixes from contributors