removed not required options variable; some other small improvements