fixes & graf
small graf :D