Fixed issues
Better