Fix spacing & markup, add comment to client hacks