Home OK, fixed bugs