Serve static files + minor changes
Clean up