Minor fixes.
Works fine. Finally.