cleans up a bit and fixes 5 for the time being