more button stuff, small tweaks