Final pass, catch some things I missed