editing some basic stuff