Fixed and finished for now.