multilib cleanup and some new options