updated some unset options to avoid deprecation messages, fixed some spelling