more fixes

still needs the buttons fixed.