General updates

Signed-off-by: Jason Chaney <jason@creativeacceleration.com>
Compiled

Signed-off-by: Jason Chaney <jason@creativeacceleration.com>