minor updates; resume later -having issues linking to qwt moc files