Minor changes to different things and some prep work for the new computer program system