added home3 and small changes all around