Add validations and fix more pathing