General clean up, bug fixes...

Signed-off-by: ScottHaileRobertson <heyemailthis+Git@gmail.com>