Adding some old updates that I never pushed.
Got a "good enough" score for now.