fixed dumb record misuses
Merge branch 'routes' into dev