Small bugs corrected