corrected some more of teh bedrock logic