fix module definitions, add drawing