removed obsolete options
some var renaming