improve interface and put stuff into options section