added commands, fixes in data source, bug fixes