additional space optimizations
Bugfix sample naming