Fixed little Design Flaw.
Minor Form Fixes.