Some bug fixes and the new index.php