Added graphics and some fixes/updates...
Cleanup and little changes