Added CCK option to the list of required fields and some indenting fixes