Serious bugs corrected