Minor fixes, additions.

Still stuck with Premium-only avatars :/