added validators & fixed barko bugs: