Small fixes/3

one small fix and one small option