Changed vectors to ArrayList because the thread locking wasn't needed.
Merge Upstream Changes

Also fix a couple of Sull's Mistakes