Added block.contains utility method
Improved generator, issues with function gen
Tests added: break, continue, return