Resource system moved to Streams, some other fixes