Fixes some things that were not finished, adds js field