#961 Major database update
#916 More coding conventions