Removed comments
Updated minor DB stuff