fixing more of larlyns mistakes