updated and fixed some things