fix up some stuff thats been bothering me