Removed zero and one.
Cleaned up some compile issues.