fixed validation, added libs