Final changes to JS lib