added more bugs