removed whitespaces
fixed conjuction in arrow type
More progress on target infrastructure.