Cleanup and a quick fix to enter URL to solution.