UnPlugged: Bug fixes.

-minor bug fixes