Adding forkFinally version of context fork and unshadowing names
Re-enabling agent build
Various comments