Revert "First Version"

Retry: Minor: Correct png results & minor cleanup