Better 404 handling
Better comments