renamed some stuff stweaked some stuff