#81 Problem mainly fixed.