Support stero maps, misc changes