Added Building + small changes