switched to boost lock types + more cleanup