A push to test my netbean project sync.

Also minor style changes.