Drawing is better and random logs removed