Updates

Adding additonal config options, updating event handlers and general
bug fixes.