Hack to get things partially working. needs to be changed.
Fixed help message formatting.