Some more changes

on form