Did some movement to allow more generic config, and cleaned up some javascript