Some minor fixes have been implemented