Many bug fixes in computer area