fixes and routing to start testing