strokeStyle and minor changes