I am the worst I am so sorry fix less fix jst closes #401 closes #402 closes #403