Comments, fixed tests.. added stuff..