htaccess and routing fixes