Removed tmp dir, updated comments and improved modules inclusion