Blackthorne Cleanup

Most important!

Nice to haves

Things I will do remotely: