#63 replaced get_option calls by using assign; also changed a few option...

... names to be more self-explanatory

Some clean-up.
@mturalenka please review and merge