fixin some left out stuff