added some concurrency annotation hints, updated some javadoc