merged in round3 settings and moved some to top