fix all the things, add cfg stuff