overall fixes