got # links working, cleaned up code, updated code to process new sites, etc.