various fixes, new button