fixed silly bugs
config macro done, perhaps
it wasn't done. Still not done, but a little more done.