Fixed obvious errors. pre validation