404 + minor fix