various updates fixing form bugs