Fixed install merge issues and updated db struct