finished some touch ups
merge conflicts fixerooo