fixes some nitpicks