more updates to overhaul
finalizing updates to overhaul - some errors do exist though
removing duplicate variables and replacing with getter/setter