added extended houseclass and fixed some stuff