Changed some basic stuff.