More work on Mac version

Keyboard support
Music fixes