major fixes
form functional