minor changes only bugs