Bugs corrected, ready to review