some fixes
fix Forms
some fixes