added various fixes.