fixed some stuff, working on performance