Final fixes to place generation I hope?