Small changes (includes visual bug, but fixes crash bug)