A few changes + htaccess