Drowing improved, TODO added.