fixing a bug, Final touches