Elmah + minor fixes
Cleaning up