Worked on new/udpating records. Also, many small cleanup changes.