Worked on everything a bit