Added more bug fixes.