Version 1.0 [Fixed]

Preliminary fixes before 1.0 goes anywhere.