added previous and fixed some others