Remove old comments
Better error management

Updated testing also