FS improvements. STL use, locking.
Cleaned up debugging code.
Added check that lock isn't already held.
Added "erase" to map. Improved includes.