minor code clean up and test after changes
clean up and removal of broken code logic
removing Dt input
re-worked Batt's model, streamlined