some bugFixes2