Chore/small adjusts