fixing a few assignments