refactor, fix settler error
select any company, other tweaks