general bug fixes.
recommitting changes