first round of skim for fixes