Fixed some leftovers and derps