fixed some crud