fix variable refactoring
clean up unit tests a little bit, small changes to the model, support eta for tasks
with simplified model relationships, a method for adding subscriptions is no longer needed