A lot of fixes and tweaks
Merge branch 'master' of https://github.com/ZAYEC77/CDB