Fixed some bugs, not yet ready.

Signed-off-by: Brian Nash <bcnjr5@MB.(none)>