Corrected some mistakes, performed some tests..