fixed up issues from merge (mostly?)