getting rid of some warnings, committing before making some more drastic changes to insert