added a bunch. html run magic, combined js work