Improvements on main (-t supported/11 tests must pass)