fixing stuff to be more valid