Fixing single data set case
Fixing Jade errors
Enforcing stack height