merge stuff from streamer45