Added Sugercane support and fixed mistakes