Minor improvements.
Better debug info.
Minor fix.
Minor bugfix
Bugfix
It's starting to look good. (Code wise.)