added some other basic stuff