fix some major derps + cleanup