Nicola Changes post-eclipse crash

-setting changes