added more basic stuff