Comments and fix drawing