Various updates and fixes, up to date with current docs

Still needs prefix by name :P