Final commit for the day

Small changes