Added some stuff; tweaked some stuff

Signed-off-by: Tyler Janca <tejanca@ccwip.net>