Fix an incorrect filename
Make sure the osm functions are added to the db
Fix some todos