added more options, moved some to advanced