Reverted to previous snap-settings
Cleaned up a bit
Commented out code that cleared track settings on non-existing shapes
Merge