PHP Doc and few tweaks.