Small bug fixes, email obfuscation.
merge