Add clips and fix forms
Continue fixes