forms.py and other updates