Bugs from init.php is fixed