some more changes and options