Build fixes
Javadoc updates
Null pointer exception fixes
Counting active hitchhikers and drivers fix