Final tweaks
Final version, no more fiddling!