A lot of improviments on code and images, new modules added