Issue#659 performance tuning

resolves #659
resolves #546
concerns #739