drawing and connection fixes

commit before lidgrin merge