Really been forgetting to commit
Cleaned up data
Update all text
More schemes, impoved cli