slight behavior changes and options