some changes to locking

ReentrantReadWriteLock still used in addition to record level locking
more changes to record locking
a lot of changes

a bloody whole bunch
forgot to commit these bloody changes
some more changes
server running