more improvements. validation works.