small overall fixes