Fixed bugs & cpu