some small changes (havent done this in a while)