Sinatra updates

Code changes thus far.  Any I'm missing?

@zquestz @klobucar