Some fixes to earlier points, done everything to point 9