Fixed bugs causing problems on a different computer