Mostly finished corner blocks
Fixed rolled back feature
Made more compact