Several bugfixes after first run on Atom PC