Frontend changes.

Merge changes with extendedmind/extendedmind.