Fixing nasty error and skeleton for smart rounds

And maybe other stuff