more bugs solved 3.0