wordpress: code tidy, and added FIXMEs