Added TODO note
Fixed modules begin/end