bugFixes
more StreamBased access