minor fixes, added buttons and fixed basses