final (hopefully) minor fixes