bug fixes, removing some default options