added 3DS, minor improvements