modifications to Database class

Also conformed old DB calls to new ones