db update and few changes