changed to png, and cleaned up a little