multiple bug fixes.