Adjustments
Completing previous commit.
Updates.
Update DB:commands.
Some adjustments.
Merge remote-tracking branch 'tbc/master'