Added some ppstuff, more vars, better building...