Finished shrouds (#7), fixed map boundaries