fixed some basic stuff