Various changes

Signed-off-by: Aaron Lathrop <ausnacht@gmail.com>