Mainly fixes to usage information, but also some small fixes removing warnings.