changed some basic stuff