implemented comments from review
mode selection removed, to be moved to boot menu