autorun button and minor improvement