Added logging and misc. updates for deployment