Add static file support, do some cleanup