added buiding and more stuff, working demo and etc