updated to new decorator and g.json for #52, also optimized lookups