Added version information, and cleaning