Some bullet/SRTReader and todomap fixes