404 bug + cleanup