massive updates for pry stuff