Distinguish different instances. Closes #61
Improved unit visibility. Closes #60