Got rid of dumb mistakes...