Next support for the wiki module as well...and small bug fixes