404, fixes, clean ups