added a few more things and fixed some stuff up