Appartment 404 link fix and TODO update