Fixed warnings
Removed previously made wrapping (whoops)
Fixed modules
Fixed potential bug