Some computational fixes have been implemented