Working on getting this all fixed up finally.