Attempting some fixes.
Crawling like a baby.