Bunch of changes...

Signed-off-by: Steven Hoffman <git@fustrate.com>