Small fixes and basic form