Small changes

Changes based on the sprint