jandi cleanup, forms working proper