fixed some basic things