Some fixes
 revert
please work