major db fixes - db version 25