some fixes: js