relaxed identifier names - bug fixes.