Performance fixes

speeds up Project.prepare()

Signed-off-by: Carter Smithhart <carter.smithhart@gmail.com>