Some hackish changes to start freshening up