More JS things + cleanup from testing