Some improvements and new graphics