Important changes from sfvivek

Take it all
Random stuff