some chages done on form (still needs to work)