fixed things and added graphics
added graphic template for later use
updates
minor changes
temp for merge
temp for merge
merge master, updated