adding fake home and fixng shortcuts