Fixed home saving

Fixes half of #37