Finished conf and improved validation