fixes and form