Many more fixes...
Snazzier looking graphs...