merged some updates from test/options branch