FIx bugs a little