Typos
More bugfixes. Working now.