minor stuff, squash this later!