Fixes and modules... and bugs.