Organization changes. Minor bug fixes.