New bugs corrected