Bugfix in ::exit and little optical corrections