Kindof End of Day commit, cleaned up some things