Big mistake corrected
Another bugs removed