More model fixes - php doc and formatting