isolated scope support
reverting back while not correctly handling the missing context
minor sample fix
removing useless commented code