Complete revision, now working.

Solved all issues. Ready for 2.0 stable release.

Signed-off-by: Keil Miller Jr <keilmillerjr@me.com>