Adding fixes, various

Signed-off-by: David Roach <dr@ammirati.com>