added 1up icons, some bug fixes