Added house/knapsack labels; fixed bug