bugFixes now working