Added volume key handling to library
Cleanup