Plugfest changes

Need a second pair of eyes, haven't had much care and attention on changes due to distractions.