Further fixing

polish, fix, polish, fix, etc. hooray