added relationship type to graph
some clean-up
some re-structure
global search improvements