minor fixes and working on commenting
merge
fexed DB