Bugfixes. Working, just few more finishing touches elft.