Various fixes
Routing time
working on deletion functionality
delete