killin some qa and map functionality