Not sure if these changes make much of a difference but committing them for now
anyways