deferred execution
minor fixes