updated basic stuff