Update to feedback, fixed some issues myself, reworded things.