Scalable from command line + Small Fixes.