fix annoying bugs