Fixed urls, cleaned up.