Architecture change, minor bug fixes.