added some more basic stuff