Revert "Fixing bugs"

This reverts commit b14e5d36a200ae19f32b3ba72e30d62024dd275a.
Snap to grid ready, improved donut