fixed some ugh issues