All old bugs corrected
