bug fixes for module 3