some improvements, more buttons!