fixed some things that were bothering me