Fixed add assignments thing and cleaned up stuff