fixes and db updates