added some other data countes and refactored some stuff