fuck
fixed merge
nightly climbing first... not quite yet on second merge upcoming
started code cleansing
comp commit, bit of a blur some tweaking/cleaning/fixing/idk