Made it work just a little bit better.
Minor fix; last commit for today