Cleaned up URLs with .htaccess, some minor other changes