more bug fixes.