Updated modules
Smaller comments form
Unused module deleted