Added friend stream, some fixes