Add validation | fix minor bugs