Some cleanup + htaccess