some fixes
fix Forms