2 grafiks, some code changes, fixed issues