more improvements. indicators selection not finished yet.