Note API routing; minor changes/fixes