Bugfix tabs + minor improvements

Bugfix tabs + minor improvements