64bit support and cleaned non CLA code