diff --git a/.gitignore b/.gitignore
index 01c15f79..dc0661d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ docs/
 node_modules/
 .gas-snapshot
 
-yarn.lock
\ No newline at end of file
+yarn.lock
+.DS_Store
diff --git a/.solhint.json b/.solhint.json
index d5e18963..7a071287 100644
--- a/.solhint.json
+++ b/.solhint.json
@@ -2,7 +2,7 @@
     "extends": "solhint:recommended",
     "plugins": [],
     "rules": {
-      "compiler-version": ["error", "0.8.18"],
+      "compiler-version": ["error", "0.8.23"],
       "code-complexity": "warn",
       "const-name-snakecase": "warn",
       "function-max-lines": "warn",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d43cdd74..eb095a44 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "solidity.compileUsingRemoteVersion": "v0.8.18",
+  "solidity.compileUsingRemoteVersion": "v0.8.23",
   "solidity.remappings": [
     "@openzeppelin/=./lib/openzeppelin-contracts/",
     "forge-std/=lib/forge-std/src/",
diff --git a/Makefile b/Makefile
index 9a7a7d10..4ab15174 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,12 @@ size  :; forge build --sizes
 # storage inspection
 inspect :; forge inspect ${contract} storage-layout --pretty
 
-FORK_URL := ${ETH_RPC_URL} 
+# specify which fork to use. set this in our .env
+# if we want to test multiple forks in one go, remove this as an argument below
+FORK_URL := ${ETH_RPC_URL} # BASE_RPC_URL, ETH_RPC_URL, ARBITRUM_RPC_URL
+
+# if we want to run only matching tests, set that here
+test := test_
 
 # local tests without fork
 test  :; forge test -vv --fork-url ${FORK_URL}
@@ -18,9 +23,15 @@ test-contract  :; forge test -vv --match-contract $(contract) --fork-url ${FORK_
 test-contract-gas  :; forge test --gas-report --match-contract ${contract} --fork-url ${FORK_URL}
 trace-contract  :; forge test -vvv --match-contract $(contract) --fork-url ${FORK_URL}
 test-test  :; forge test -vv --match-test $(test) --fork-url ${FORK_URL}
-trace-test  :; forge test -vvv --match-test $(test) --fork-url ${FORK_URL}
+test-test-trace  :; forge test -vvv --match-test $(test) --fork-url ${FORK_URL}
+trace-test  :; forge test -vvvvv --match-test $(test) --fork-url ${FORK_URL}
 snapshot :; forge snapshot -vv --fork-url ${FORK_URL}
 snapshot-diff :; forge snapshot --diff -vv --fork-url ${FORK_URL}
+trace-setup  :; forge test -vvvv --fork-url ${FORK_URL}
+trace-max  :; forge test -vvvvv --fork-url ${FORK_URL}
+coverage :; forge coverage --fork-url ${FORK_URL}
+coverage-report :; forge coverage --report lcov --fork-url ${FORK_URL}
+coverage-debug :; forge coverage --report debug --fork-url ${FORK_URL}
 
 
 clean  :; forge clean
diff --git a/foundry.toml b/foundry.toml
index f3e432f9..262de881 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -2,7 +2,7 @@
 src = 'src'
 out = 'out'
 libs = ['lib']
-solc = "0.8.18"
+solc = "0.8.23"
 
 remappings = [
     "@openzeppelin/=lib/openzeppelin-contracts/",
diff --git a/lib/tokenized-strategy b/lib/tokenized-strategy
index 0d90dee1..cf791a6f 160000
--- a/lib/tokenized-strategy
+++ b/lib/tokenized-strategy
@@ -1 +1 @@
-Subproject commit 0d90dee170d53a0e04af3ff41d2f7a4f3ac395bd
+Subproject commit cf791a6f2d360e5c33866c9f0de10e83085920e9
diff --git a/lib/tokenized-strategy-periphery b/lib/tokenized-strategy-periphery
index bbc3a035..6ce8d29b 160000
--- a/lib/tokenized-strategy-periphery
+++ b/lib/tokenized-strategy-periphery
@@ -1 +1 @@
-Subproject commit bbc3a0354f45dab087a4c82650e42225433c8fef
+Subproject commit 6ce8d29b1e107a89754dd9f17337582734989b4d
diff --git a/package.json b/package.json
index 441bb9f0..2a4917ea 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
         "prettier": "^2.5.1",
         "prettier-plugin-solidity": "^1.0.0-beta.19",
         "pretty-quick": "^3.1.3",
-        "solc": "0.8.18",
+        "solc": "0.8.23",
         "solhint": "^3.3.7",
         "solhint-plugin-prettier": "^0.0.5"
     },