Graphics & Bug fixes

See change log for bug-fixes