More small opts
More opts
fix warnings & errors