Code cleanup. Removed cck functions from the D6 version, introduced some helper functions, added checkbox support