improvments in js :)