Better headers support, some bugfixes
Add module pattern support