Some fixes;
Updated.