Cleaned up some. Merged with head manually.