Commits


try to do better with headers


odds and ends