sort out spacing + some more feedback amends