corrected more bugs