Added validation plugin + bug fixes