incremental update
findbugs inspired tweaks
Update target platform