first check-in for some files, plus format tweaking