Edited a few things