Resync all new enhancements / fix doit.php