made modification to deal with bugs relating numeric values interacting with strings and dates being difficult