turned off export while testing + fixes