more bugs solved