some bugFixes