some updates - need things from jon