Graphics addition and some of the bug fixing