updated as much primer stuff as possible