some finetuning and performance fixes and draw