moved graphs to extra namespace
minor changes