Shell and bugfixes