Some small fixes, some work on multiple employee support.