At Home Alone Final: *fix Bugs

*fix Bugs