Added complex forms

Added all complex forms to magic JSON.

Some compilation error fixes.