properly export for js & some small fixes