cleaned up. Will work on partial hets later.