buttons and simple fixes