added suppressMessages option
+ cleanups