Small improvements + Docker + args