Minor changes, will be updated/fixed shortly.