changes round 1 - fixing spacial inconsistencies