trying to fix few glitches I commented on https://github.com/arkhebuz/datawatch/pull/1