forms bugs fixes