Comeback, some fixes, new image