fix in some stuff to make it more usable