Weekly Update

Merging all my stuff before I switch houses. Lotsa map work.
Cleanup

scaps to scraps, unnecessary stuff removed