Update 7

Going to eat breakfast/ minor fixes in code