Fixed issues - see github