Tweaked some variables based on feedback