Assimilator - fixed some bugs