fixed small CLI issues
Fixed some minor global issues

Added Db2 support (untested and with need of some fixes)