Fixed db issues and added cross charge to summary