Few bugfixes. Moving PC too.