Fixes, formatting and content