master: more tmp clean up, error page for aws in place