Added caps on cylinder, and fixed winding