solved a few more but mostly clean up