fixing bug and exporting more