Fixed form
Additional entry checks