various bugs corrected