minor changes. bug fixes.