added a options extension
some updates
updated tests